Switch license to GPLv3 or later.

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 0f7fe6855b555acbeef40fb8937042ea8a0933c1..8d48ea8f98504c746c6e96f6bbad3f6585817902 100644 (file)
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -207,7 +207,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/ChangeLog b/ChangeLog
index c53ed83f0679d47ec826725bc0f43ca5ca6ab5f9..4827a53d16ea433d7b134186aa366478943f913d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6482,7 +6482,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/INSTALL b/INSTALL
index 80ee412543b13282dd5a56212ccc9339b42ea19d..9f754a05cb3656adc7e00a839b350b5d96ddd0d5 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -911,7 +911,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/INSTALL.CVS b/INSTALL.CVS
index 7e785fcac0da95c17cc40f2505eac9a09ec0b107..efd8618ca463e8957f1e4e62b146791a91209215 100644 (file)
--- a/INSTALL.CVS
+++ b/INSTALL.CVS
@@ -88,7 +88,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/Makefile.in b/Makefile.in
index 91bf7e935fa6f0055fc21f70e19a19afc03d1966..2959c9d7e122500c4fff50ec73613fc629e88045 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/README b/README
index a0bc92d58d215e03aaae43d5b4f86478730f3538..a63bff17ea74c2a530980d155a860cad48e931e6 100644 (file)
--- a/README
+++ b/README
@@ -98,7 +98,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/config.bat b/config.bat
index 9e56b782256eb144fbcc078034777f9ba8eb2c03..1f544d3e27448bf083ae105e0d19823a70fcbe75 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -8,7 +8,7 @@ rem   This file is part of GNU Emacs.
 \r
 rem   GNU Emacs is free software; you can redistribute it and/or modify\r
 rem   it under the terms of the GNU General Public License as published by\r
-rem   the Free Software Foundation; either version 2, or (at your option)\r
+rem   the Free Software Foundation; either version 3, or (at your option)\r
 rem   any later version.\r
 \r
 rem   GNU Emacs is distributed in the hope that it will be useful,\r

diff --git a/configure.in b/configure.in
index a5033e96247456f78eae4b2f53480af3e8b9f16e..eed8891aa5c5a53766b89ea3d076300f579adc6c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ dnl  This file is part of GNU Emacs.
 dnl
 dnl  GNU Emacs is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
-dnl  the Free Software Foundation; either version 2, or (at your option)
+dnl  the Free Software Foundation; either version 3, or (at your option)
 dnl  any later version.
 dnl
 dnl  GNU Emacs is distributed in the hope that it will be useful,
@@ -2945,7 +2945,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,